Issue #2143415 by YesCT, mikeryan, marvil07, bdone, chx: Migrate fixes