Fixes: U4-3430 Save Properties not working for usercontrol macro