DEV-23692 fix3
Merge branch 'master' into releases