Cherry picked from b9a3f6606f83c5d0f1fdd7a9d7cd20c9cd7050d3

Signed-off-by: Florian Hoelzl <hoelzl@fortiss.org>