.......... [ZBX-5243] updated to the latest trunk