fix hybiconnector bugs
Merge "fix hybiconnector bugs" into 0.3.x