Merge branch 'jc/more-sanitizer-at-ci'