Merge remote-tracking branch 'jm/move-delete-mif' into morning-merge
Attempt to fix test compile error