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