Merge pull request #3065 from dtmax/develop

fix calling of callable hooks