MT#6169 Warning obsolete-relation-form-in-source has been fixed

(cherry picked from commit 1918f2b149e0461d9bf9ca6151d8ee2fb66a5f1b)