(cherry picked from commit 682674dd5f) Co-authored-by: Tristan Le Guern <tristan.leguern-presta@deveryware.com>
682674dd5f