Merge "Fix EXT_INTER unit test failure in 32-bit builds" into nextgenv2