Manually merging in adjustments made to content in main Guggenheim code into the component.
Merge branch 'js-hotfix-sync'