[#48819125] smoothly switch into gplus mode as needed