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