.......... [ZBX-4675] merge from upstream