Cherry pick of acme stuff from botched merge