Hi Frans,
As per FLX-1496 I propose this fix. Adding also Elena as reviewer, since, I think, she is working on a similar issue within the phase2/strip branch