Cherry-pick "Limit exception remove" into release/0.14

David Diederich requested to merge cherry-pick-cc4d497a into release/0.14

Original MR: !377 (merged)

Merge request reports