Merge branch 'refs/heads/t/ubsan'