Merge "Prevent a 4-way binder interlock leading to a leak."
tree: 250e493a01f79e2fddbc74d550bc1d2a469daeec
  1. core/
  2. services/
  3. tests/