[#31008] Sync up Platform Bootstrap
Changelog X3