Merged "notes" branches