CAP-1603 - fixed ordering issue of non versioned runs
Merge branch 'develop'

* develop:
  CAP-1603 - fixed ordering issue of non versioned runs