PHOENIX-1188 Performance regression for non-aggregate queries