Merge "Fix feature config for clustering"