Merge "[Fix confirmCredntials flow]"