Merged branch 'GateRender-works' into master