OK for CONTRIB-823 and CONTRIB-4075.

Signed-off-by: Joseph Rézeau <moodle@rezeau.org>