dashboard fixes and debug leak

Change-Id: I126d707d56ed06a34110efef3c535b15098b8d75
Merge topic 'dashboard_fixes' into master

0713f8b7 dashboard fixes and debug leak