OPSMN-1543: Merged the fix from master to v1.0.1