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