[AC21.5] [R21.4] Re: Preserve hooks locality