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