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