Merge "Fix render_ahead properties" into sc-dev