Merge pull request #1044 from Arantor/release-2.1

More fixing for the toggler stuff in general