.......... [ZBX-8443] merge from trunk