Merge change 617 into donut

* changes:
  Allow caller-supplied column aliases in queries even when a projection map is used.