This commit improves the detection of a property source when more than
one group with the same type exist.

Closes gh-16549