[#69851230] Finishes cross-platform portability work