Merge branch 't/t0004_fix'