BugID: 93542

Correcting join condition to match table name to make sure join condition
is correctly processed.
Merge branch 'bugid-93542' into dev