Merge branch 'sanity-check'