First pass at migration basic automation.
Merge remote-tracking branch 'origin/testing' into testing