fix: #3629120 Server-side dependency grouping combines different target...

James Candanrequested to merge
issue/conditional_fields-3629120:3629120-server-side-dependency-grouping into 4.x

Closes #3629120

Merge request reports