Merge branch 'js/t6026-clean-up'