Merge "Do not use hidden noteOpNoThrow"