Fixing switch case that was out of order.
Merge branch 'dev-db' into dev-test