CDMT-78: tree map declaration changed