fix ga bug
merge branch 'dev' into build
build