Merge branch '308-fix_complex_rail_generator_infinite_loop' into '308_fix'

Prevent the complex rail generator from looping endlessly

See merge request !282
3 jobs for 308_fix in 45 minutes (queued for 24 seconds)
latest