Merge branch 'jk/test-annoyances' into maint