issue #23404: try to root out nondeterminism
Merge pull request #1409 from shackbarth/23404

issue #23404: try to root out nondeterminism