Created by: rvantonder
Addresses #6625 (closed).
Test plan: https://github.com/comby-tools/comby/pull/140