Merge "Fix invalid read in render property buffer" into devel/master