a few migration script tweaks
Merge branch 'master' into integration