Merge "Reducing uniform memory usage" into devel/master