Fixed backwards compatibility for dealing with event listeners
Merge branch 'feature/placeholder-prop-hook'