Port changes from OGSR to fix #1748#1749

yohjimane wants to merge 2 commits intoOpenXRay:devOpenXRay/xray-16:devfrom

yohjimane:yohji/devyohjimane/xray-16:yohji/devCopy head branch name to clipboard