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