DEV-17009
DEV-17009 part2
DEV-19351
DEV-19351
DEV-18993
DEV-18993 js
Merge branch 'master' into releases