Merge branch 'nw/t1002-cleanup'