Merge "Support separate VF Counts for different Targets"