Merge "NPatch rendering optimization" into devel/master