Phase2 hgx14

Cure the geometry issue