Revert "fix 4413"

This reverts commit eceb7fa13645a2e701e6421663ae456783b94dff.

caused unit jittering / many NP=0
Revert "Revert "fix 4413""

This reverts commit 0822467a3f625d81cdc77ee95581caa26d200199.
Merge branch 'develop' of https://github.com/spring/spring into threadtrace