Fix for the issue OPSMN-1446