Fix: Tons of regression after renaming note field into note_private.
Merge branch '3.4' into 3.4_agefodd