CAP-1603 - fixed ordering issue of non versioned runs