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