Merge branch 'mg/notes-dry-run' into next