Added logging
Merge branch 'hotfix/DOM-47'