(cherry picked from commit 3cc9a98ce584a48f6c430a57126bd548e9dedc7e)
Signed-off-by: Jonathan Rainville <rainville.jonathan@gmail.com>