Merge branch 'hotfix/2.0.4'
code refactoring follow-up
Merge branch 'hotfix/2.0.5' into develop