CDB-1688 Part II of the tickets (added to git too early the file)