Merge pull request #1959 from danielgranhao/stop-passing-init-features-in-msg-handlers