394.25 Sync-up point with G2 build 020.20