Don't re-trigger 'refresh' events on the class
Merge branch 'events-refactor' into dev