(cherry picked from commit c94c00915f) Signed-off-by: Marc Khouzam <marc.khouzam@ville.montreal.qc.ca>
c94c00915f