Merge "ChangeHook now accepts CurrentUser for filtering"