Merged with latest master, fixes to IOT dashboard