Ensure I can toggle invoked element
Merge branch '1.x' into gh-pages