Merge branch 'jk/t5531-prepare-to-default-to-non-matching'