This merge request just adds two sim flags, which will be used by the developments in !63059 (merged).
This should make no difference to the simulation output, but it is useful to add it first, so that the other changes can be added independently and be shown to also not change the simulation output.