Signed-off-by: David Svantesson <davidsvantesson@gmail.com> (cherry picked from commit b2d23a1389)
b2d23a1389