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