Merge Gtil Catalog changes to master.