Merge pull request #6252 from rudkx/requires-deterministic-behavior