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