Change fields on db
Change fields on db
Merge origin/WS_with_DBconnect into WS_with_DBconnect
Change fields on db