Merge "partial rendering" into devel/master