There is an upstream bug report related to the same problem containing a fix: https://bugs.documentfoundation.org/show_bug.cgi?id=97721 Maybe the patch could be backported to stretch before the release? Thank you.