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