Cherry-pick 'ibm-changes' to release/0.5

David Diederichrequested to merge
cherry-pick-bd4f28a0 into release/0.5

This merges !16 (merged) into the release/0.5 branch to be included as a new patch

Edited by David Diederich

Merge request reports