Cleaned up orphaned query annotations
Fixed merge conflict
Fixed merge conflict
Merge branch 'sdj' into sdr
Merge branch 'sdr'