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