CDB-1306 fixe more specs that will be activated after merge with release