Merge branch 'jc/notes-batch-removal' into next