Merge "complete the h81x to g4 unification"