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