Merge branch 'bld/x32' into next