(cherry picked from commit e49aa48dbb) Co-authored-by: Dominik Eckelmann <deckelmann@gmail.com>
e49aa48dbb