Merge "Update rally version"