Merge branch 'rr/t4041-cleanup'