1 Followup for bug#9011  - New value after value mapping can't be 0.
Merge remote-tracking branch 'upstream/rel-3_2' into rel-3_2