fix(g3v1x): sync g3v1x and master branches.

Earlier commit was wrongly submitted differently to g3v1x and master.