430.01 Back-porting G2 planning changes