0.98: Improved entity management, options and Home Assistant Alerts

I was getting it, but was able to resolve it, but it is back again. Discussion about it on github here: https://github.com/home-assistant/home-assistant/issues/26438