Merge "Add hacks for better handling count value during migration."