Merge master into GateRender-works