Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro> (cherry picked from commit d1bff73611bb31e3d9b952d55cd00c7bbf43b12e)