--farmerbook fixes
Merge remote-tracking branch 'origin/migrate_server' into migrate_server