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