Cherry pick MR 234 to release/0.16

Morris Esteparequested to merge
cherry-pick-884edd78 into release/0.16

Original MR: !234 (merged)

Edited by David Diederich

Merge request reports