TBD-1018: fix the problem of wrong db type.
Merge remote-tracking branch 'origin/maintenance/5.6'