.......... [ZBX-8665] updated to latest from /branches/2.4/