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