DEV-22995
DEV-22490 fix1
DEV-22995 fix1
DEV-22490 fix2
Merge branch 'master' into releases