Merge branch 'jk/test-annoyances'