Related: brassberg/tickets#244


(cherry picked from commit 28cc1658)

Co-authored-by: Michael Danielczok <michael@pcsg.de>