Co-authored-by: Brecht Van Lommel <brecht@blender.org> (cherry picked from commit d2908b27940fdc829a8bff96570972cd628d65a0)