For #27418 - Hook loading is now thread-safe
CR fixes