Approved by: will
into a tree structure. PR: 21421 Submitted by: Mario Sergio Fujikawa Ferriera <lioux@uol.com.br>