[sr-dev] [tracker] Task closed: Improvement for db_cluster