.......... [ZBX-7436] merge from trunk
.......... [ZBX-8040] updated to trunk