Co-authored-by: Ricardo M. Correia <rcorreia@wizy.org> (cherry picked from commit 8f166b95c9ee10743039d1f2b1c21f9edee5da88)