Merge branch 'jc/maint-limit-note-output' into maint