merge from care-migration-0.24 branch to migration-0.24