Merge branch 'sb/t1020-cleanup'