Merge branch 'tg/t5570-drop-racy-test'