.......... [ZBX-8083] merge from 2.2