Merge pull request #4261 from jmarshallnz/zeroconf_level