DF-5419 rearrange version refs