Merge and debug plumbing with develop.