#1113-Refactor
Merge branch '1113-refactor' into develop
Merge branch 'develop'