DEV-22490 fix3
Merge branch 'master' into releases