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