Fix helper loading event handling
Merge branch 'master' of github.com:walmartlabs/thorax