Follow-up EZP-21820 & EZP-22174: further simplifications
Merge pull request #862 from guillaumelecerf/followup_EZP-21820_EZP-22174

Follow-up EZP-21820 & EZP-22174: further simplifications