sync with G2 code base - builds 039.xx