AABP 614: Buck Management

---