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