.......... [ZBX-8524] updated to the latest /trunk