Merge "Rendering optimisation with AddOn" into devel/master