Core-1628 Google drive issue fixed