Merge branch 't/t0004'