.......... [ZBX-7976] updated to latest from /branches/2.2