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