Merge "Bug 565699 - Add support for bulk migration" into develop