Merge "Fix: Fix for ambiguous and broken disk formatting dialog" into…

… cm-11.0