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