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