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