Add QueryOptions
and QueryBaseOptions
interfaces
#3569
Merged
QueryOptions
and QueryBaseOptions
interfaces
#3569