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