PR from GCI staging_done branch

Had to do some conflict resolution as well. :|
No, not needed. You can use:

    limitby = (0, qty)

in the select.