Merge Query changes in master