DEV-18880
DEV-18949
Merge branch 'master' into releases