More devicehub related updates