Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> (cherry picked from commit d963c6d868)
d963c6d868