ECMS-5489 Fix some problem during migration on cloud