Merge server_database_dev into dev

I have made some progress in server_database_dev and it is ready to merge back into dev.