CON-1444 | some 'todo' comment