DB/Waypoint: Edrick Killian & Mattie Alred

By Kittnz, closes #13101