G+ will be remove, new implementation needed
Merge remote-tracking branch 'origin/without_Gplus' into without_Gplus