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