Changes related to G2 port