UICustomizeKit update
Merge pull request #8170 from daltoniam/master

UICustomizeKit update