Take in changes from https://github.com/home-assistant/core/pull/114591 #33

Closed dmulcahey closed 3 months ago