Merge "Adjust visibility rules for migration"