(cherry picked from commit 543218fc7c)
543218fc7c
Co-Authored-By: Hugo Locurcio <hugo.locurcio@hugo.pro>