Control Panel and enrollment Updates
Merge remote-tracking branch 'remotes/origin/proimage-v2.1'