Merge "BQ: Replace items from back of queue" into nyc-dev