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