diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java
index 0cbdef3a8fe..7e907ba7857 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java
@@ -70,6 +70,9 @@ public class K2JVMCompilerArguments extends CommonCompilerArguments {
     @Argument(value = "Xallow-kotlin-package", description = "Allow compiling code in package 'kotlin'")
     public boolean allowKotlinPackage;
 
+    @Argument(value = "Xskip-metadata-version-check", description = "Try loading binary incompatible classes, may cause crashes")
+    public boolean skipMetadataVersionCheck;
+
     // Paths to output directories for friend modules.
     public String[] friendPaths;
 
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java
index b2577a763fc..48f008e10a5 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java
@@ -72,9 +72,10 @@ class Usage {
             sb.append(" ");
             sb.append(description.value());
         }
-        while (sb.length() < OPTION_NAME_PADDING_WIDTH) {
+        while (sb.length() < OPTION_NAME_PADDING_WIDTH - 1) {
             sb.append(" ");
         }
+        sb.append(" ");
         sb.append(argument.description());
         return sb.toString();
     }
diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
index 0e871954e54..37ccf875073 100644
--- a/compiler/testData/cli/jvm/extraHelp.out
+++ b/compiler/testData/cli/jvm/extraHelp.out
@@ -6,6 +6,7 @@ where advanced options include:
   -Xreport-perf              Report detailed performance statistics
   -Xmultifile-facades-open   Compile multifile facade classes as open
   -Xallow-kotlin-package     Allow compiling code in package 'kotlin'
+  -Xskip-metadata-version-check Try loading binary incompatible classes, may cause crashes
   -Xno-inline                Disable method inlining
   -Xrepeat <count>           Repeat compilation (for performance analysis)
   -Xplugin <path>            Load plugins from the given classpath