Merge branch 'bug_888_refactoring' into develop
temp fix
Merge branch 'develop' into bug_888_refactoring