CDB-3497 Splitted