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