(cherry picked from commit 448b8cbcda) Co-authored-by: Dennis Israelsson <dennis.israelsson@gmail.com>
448b8cbcda