Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> (cherry picked from commit 6286736219)
6286736219