Back port !544 to 0-88-stable

Axel von Bertoldirequested to merge
avonbertoldi/544-backport into 0-88-stable

Backport !544 (merged) to the 0.88 stable branch for a 0.88.3 release

Merge request reports