Merge "Fix build error when updating Wm Extensions prebuilt" into main