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