code refactoring follow up
Merge branch 'hotfix/2.0.4'