Merge commit 'ba74d7ccadc34d09d57886120e9d412d9edbc4d7' * commit 'ba74d7ccadc34d09d57886120e9d412d9edbc4d7': Fix issue with authentication with flash
Merge commit 'ba74d7ccadc34d09d57886120e9d412d9edbc4d7' * commit 'ba74d7ccadc34d09d57886120e9d412d9edbc4d7': Fix issue with authentication with flash