Merge request - (try) Fixing OADP-182, skip for OSP and add error
Merge request - Merge branch 'reg-run-v1.4.2' into 'master'