Merge branch 'jk/sanity' into maint