Merge "Use previous version if version is a codename"