Bug #1813: Add migrator to 3.8.4
Merge remote-tracking branch 'upstream/one-3.8' into one-3.8