Merge branch 'feature/8998_refactoring_fe' into 'develop'