Merge "Remember non-note tree entries when reading"