Merge "Adding CategoryTree" into REL1_31