Merge branch 'en/t6042-insane-merge-rename-testcases'