Merge branch 'devel/graphics_engine/master'