Fixed: GenericInterface: mapping key can't map from / to 0 (bug#10259).
Merge remote-tracking branch 'upstream/rel-3_2' into rel-3_2