Merge branch 'devel/graphics' into devel/master