Add support for simpler (Callable) hooks (issue #2917)
[ci skip] Fix a test skip message
Fix #2919
update