Signed-off-by: Mathieu Parent <math.parent@gmail.com> (cherry picked from commit d9e5bbc09d)
d9e5bbc09d