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