10.2 toggle button updates for issue #913