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