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