Merge "Add start/finishProxyOp methods"