.......... [ZBX-8727] merge from 2.4