[DF-29] merge with development. Things should be checked but desert_trains opens