Merge "Rename getOpId() to getOperationHandle()." into main