Merge branch 'jk/sanity'