423.08 sync with G3 code base 039.10 commit