Merge "Allow self-blaming in noteProxyOp and startProxyOp"