Update versions and Changes to simplify pull request