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