feat: #3579963 Support workspaces with component variants

Ajit Shinderequested to merge
issue/component_variants-3579963:3579963-support-workspaces-with into 1.0.x

Closes #3579963

Merge request reports