Remove overcomplicated Toggle/Switch onTrigger data
Merge branch 'hotfix/2.2.6'