Merge pull request #13584 from eileenmcnaughton/user_dash_use_api