[1336653] - Fix multiversion bugs and ESX changes