Merge "Merge branch 'devel/master' into devel/graphics" into devel/master