Merge branch 'jk/t2107-now-passes' into next