DEV-19874 v.2
Merge branch 'master' into releases