.......... [ZBX-8040] updated to trunk