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