Incorporate notes-base changes.