diff --git a/build.gradle b/build.gradle
index 2f7698d9db59..06e8fd0ef09e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -219,6 +219,11 @@ allprojects { currentProj ->
     eclipse.classpath {
         defaultOutputDir = file("build/default")
         file.whenMerged { cp ->
+            // Remove bare 'src/main' source folder entries that cause Eclipse nesting errors.
+            cp.entries.removeAll { e ->
+                e instanceof org.gradle.plugins.ide.eclipse.model.SourceFolder && e.path == 'src/main'
+            }
+
             cp.entries.forEach { cpe ->
                 if (cpe instanceof org.gradle.plugins.ide.eclipse.model.SourceFolder) {
                     cpe.output = cpe.output.replace "bin/", "build/classes/java/"
diff --git a/docs/developer/developer-manual.html b/docs/developer/developer-manual.html
index 033a12fdd5e8..c1dc87b1f6df 100644
--- a/docs/developer/developer-manual.html
+++ b/docs/developer/developer-manual.html
@@ -275,7 +275,7 @@ <h2 id="IDE_configuration">IDE configuration</h2>
 </p>
 
 <p>
-For VS Code and Eclipse, run <code>./gradlew eclipseClasspath</code> before running
+For VS Code and Eclipse, run <code>./gradlew eclipse</code> before running
 the IDE for the first time.
 This ensures generated files are not put in the standard <code>../bin/</code> directories.
 </p>
diff --git a/docs/manual/contributors.tex b/docs/manual/contributors.tex
index ed211a6a48ae..83ccd0c903c1 100644
--- a/docs/manual/contributors.tex
+++ b/docs/manual/contributors.tex
@@ -51,6 +51,7 @@
 Hamed Taghani,
 Hannes Greule,
 Heath Borders,
+Henry Xi,
 Ivory Wang,
 Jakub Vr\'ana,
 James Yoo,