CDB-1692 Branch stabilization after merge with master