Merge remote-tracking branch 'origin/v3-db-clients' into v3-db-clients

# Conflicts:
#	server/utils/utils.js