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