Merge pull request #22724 from brvphoenix/sing-box