Merge pull request #18859 from kamil-tekiela/getDbInfo