Merge change 8183 into donut

* changes:
  Improve UX of adding credential...