Merge branch 'my_devel' into split_rendering_formal_improvements