changes for TheWeatherCompany/grid-ap#522 + change for TheWeatherCompany/grid-ap#562