Merge "Take a wrench to the pipes" into oc-dr1-dev