Allow add a condition telling the table to avoid ambiguity error.
Merge pull request #2504 from thiagotalma/master

Allow add a condition telling the table to avoid ambiguity error.