.......... [ZBX-7850] updated to latest from trunk