Merge pull request #16349 from jmcnevin/master

Correctly determine if migration is needed.