Merge commit '66959341a6b0891893d4c851be708c3073f61154' * commit '66959341a6b0891893d4c851be708c3073f61154': Fix behavior of cancelling the name cred. dialog.
Merge commit '66959341a6b0891893d4c851be708c3073f61154' * commit '66959341a6b0891893d4c851be708c3073f61154': Fix behavior of cancelling the name cred. dialog.