Sweeping !36067 from 21.3 to master. Simulation r-index endless loop fix

Simulation r-index endless loop fix

See merge request !36067 (merged)

Merge request reports

Loading