Merge branch 'hotfix/removeJSLogging'
Merge branch 'release/2.0.3'
code refactoring follow up
Merge branch 'hotfix/2.0.4' into develop