Massive migration optimiser improvements + RenameModel opn