Synced artifact version and DB drivers versions with upstream
Merge branch 'master' into dev