EZP-22867: further enhancements

it's me of these lines are cutted at the end?