Layoutgroupsave corrected + minor correction to CatalogTree.
Merge remote-tracking branch 'master/master'