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