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