x-trace migrations, minor fixes
Merge remote-tracking branch 'origin/master'