SE-283 fixed ambiguous rule match around ref and xref
Merge remote-tracking branch 'origin/dev-SE-283' into release-2.7.9rc