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