Merge commit 'fa32a45af724f675215bff920dd264be4a9aae24' * commit 'fa32a45af724f675215bff920dd264be4a9aae24': update device dashboard
Merge commit 'fa32a45af724f675215bff920dd264be4a9aae24' * commit 'fa32a45af724f675215bff920dd264be4a9aae24': update device dashboard