Merge "    Fix issue with authentication with flash" into eclair-mr2