Merge pull request #15365 from samuelsov/userdashboard