Re-apply recent qa test fixes lost in last weekend's merge.
Merge remote-tracking branch 'origin/qa' into qa