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