Update versions
This refs affinitic #5666