backport master #36

Closed boeschf closed 4 years ago