Revert "Revert "Update to latest versions""

Revert again to rest in dev

This reverts commit 16feb1c041aa402f9e5dcbd78db13e8a29b1e251.