Resolve #3582223 "Convert hooks to"

Andrei Ivnitskiirequested to merge
issue/fasttoggle-3582223:3582223-convert-hooks-to into 4.1.x

Closes #3582223

Merge request reports