.......... [ZBX-8286] merge from trunk