EZP-22867: further enhancements