Backport the accidental fixes
Backport the note fixes