contrib: merge r5422 to trunk