Merge "Add two new hooks to fix broken CentralAuth unit tests"