prevent ambiguous field in user-defined where clause
merge upstream
set() objectToArray fix
Merge pull request #218 from will123195/3.0

3.0