Merge branch 'ak/t0008-ksh88-workaround'