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