=str #16321 Harden FlexiMergeTest
Merge pull request #16360 from akka/wip-16321-FlexiMergeTest-patriknw

=str #16321 Harden FlexiMergeTest