[TASK] Make variant and version both excludeFields