Pin versions affinitic refs #5698