Changes are done for OPSMN-1499