Completes https://github.com/XTLS/Xray-core/pull/6807 and https://github.com/XTLS/Xray-core/pull/6810
Closes https://github.com/XTLS/Xray-core/issues/5495#issuecomment-3710683679