Merge "Fixes release tags and versions"