138e410a06
* standardize usage of note field
(cherry picked from commit 6ef5c53b0c)
* standardize usage of note field
(cherry picked from commit 6ef5c53b0c)