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