UICatalog fix for 7.1
Merge pull request #2061 from sebv/uicatalog-fix

UICatalog fix for 7.1