Merge Query changes from master