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