[#827] Adds  to button for full ga integration
Merge branch '827-ga-fix'