Changes for ZDC 730x to fix geometry bug