This MR ports from 21.9 to master the simulation related changes from !47155 (merged)
Adding @tadej and @aleopold to follow