MT#6169 Fix warning obsolete-relation-form-in-source

(cherry picked from commit 8416fc1e2f5c5c1e09cf839979cd6871b57109b8)