I consider that ENYO-3181 is fixed by this PR.