Merge commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1' * commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1': Add credential storage settings.
Merge commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1' * commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1': Add credential storage settings.