[allow regression] potential fix to 1100

@venkateshsa, please have a look. it solves the crashes and also remove a section where there were saturation. so to me it seems to work, let see the test results.

@venkateshsa, @kiene, the pipeline failed without [allow regression], I checked few cases and most the time the differences are minor, and the few times they are bigger, it seems in favor of the fix. So please have a look to see if I miss something, if not remove the draft state and merge it when you are ready.