DEV-22863 fix1
Merge branch 'master' into releases