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