Done: https://github.com/home-assistant/home-assistant/pull/10001 & https://github.com/home-assistant/home-assistant.github.io/pull/3696