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