make the class global
Restructure Parts of UCP
Merge branch 'develop' into release/12.0
missing functionality