.......... [ZBX-7949] updated to latest from trunk