OPSMN-1543: Merged changes from OS v1.1 to OS v1.0.1