Merge changes Id19c62b2,I0d5f5bbb

* changes:
  Adapt SharedRefDbExceptionHook to changed ExceptionHook API
  Auto-format source code using gjf