Merge "Fix feature versions"