Google Source merge with Franco Branch 3.4 jb 1