test query extra
merge changes from upstream