Merge "Replace noteOp call to checkOp" into main