Merge branch 'chore/fast-sanitize-bump' into 'develop'