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