Cherry-Pick fixes from the 9.18 branch

Bernhard Schmidtrequested to merge
berni/bug-1056984 into debian/9.19

Cherry-Pick fixes done in the 9.18 branch after 9.19 forked off

Closes: #1056984

Merge request reports