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