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