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