Merge "Fix clustering versions"