Core-1628 fixed Google drive issue