DEV-21249 v4
DEV-22694
DEV-22694 bug fix
DEV-22869
refactoring: use div js_container instead of different div
refactoring
Merge branch 'master' into releases