Merge branch 'master' into 1278-add-clustered-db-info