Merge commit '2f1eee34706cf42855541def5737c37a071d7293' * commit '2f1eee34706cf42855541def5737c37a071d7293': Fix issue #3117472: Format storage dialog still broken
Merge commit '2f1eee34706cf42855541def5737c37a071d7293' * commit '2f1eee34706cf42855541def5737c37a071d7293': Fix issue #3117472: Format storage dialog still broken