Merge branch 'tb/t0027-raciness-fix'