Closed bergmannf closed 5 years ago
Backport of #626.
Superceded by #712 - github didn't like force-pushing new cherrypicks it seems.
Backport of #626.