423.07 sync with G3 code base - 039.03 intermediate commit