instrumentation: Make hooks compatible with presets
6 files changed