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