Togglecontrol

Merged username-removed-535549 requested to merge togglecontrol into master