VIVO-550 and VIVO-551 migration improvements