Merge pull request #2800 from marcossffilho/develop

Store Hooks objects