.......... [ZBX-8863] Merge from trunk