allow discards.
Merge remote-tracking branch 'origin/vpccb'