Merge branch 'refactoring/fix_render_view' into 'develop'