(cherry picked from commit 54fa7b57fe) Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
54fa7b57fe