Merge branch 'jc/clean-after-sanity-tests'