SDMS-882(by Rory)