Merge branch 'hotfix/DOM-46' into develop
Merge branch 'release/1.0'