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