Merge "Add NOTE related to 'on-demand' migration"