DEV-22490 fix4
DEV-22869 fix3
Merge branch 'master' into releases