Merge "Use public noteOp method"