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