diff --git a/Documentation/project-docs/DefaultInterfaceMethods.md b/Documentation/project-docs/DefaultInterfaceMethods.md
new file mode 100644
index 00000000000..688218abc13
--- /dev/null
+++ b/Documentation/project-docs/DefaultInterfaceMethods.md
@@ -0,0 +1,144 @@
+# Xamarin.Android and C# 8.0 default interface methods
+
+We have been trying to implement support for C# 8.0 default interface methods (DIMs) in Xamarin.Android, to reflect Java 8 default interface methods (DIMs). Here we are going to write some notes about it.
+
+## Reference materials
+
+There are [couple](https://github.com/dotnet/csharplang/issues/52) [of](https://github.com/dotnet/csharplang/issues/288) [relevant](https://github.com/dotnet/csharplang/blob/master/proposals/default-interface-methods.md) [issues](https://github.com/dotnet/roslyn/issues/17952) (and docs), but not everything is consistent. This post is written based on the implementation (mono's `csc-dim` version of csc) I have been using and packaging.
+
+## What are different from Java
+
+The feature is similar, but there are actually some caucious differences.
+
+This is how C# 8.0 DIMs work:
+
+```
+~/Desktop$ cat dim.cs 
+using System;
+
+public interface IFoo
+{
+    int X () { return 1; }
+    int Y => 2;
+}
+
+public class Bar : IFoo
+{
+}
+
+public class Baz
+{
+	public static void Main ()
+	{
+		var bar = new Bar ();
+		var foo = (IFoo) bar;
+		Console.WriteLine (foo.X ());
+		Console.WriteLine (bar.X ());
+	}
+}
+~/Desktop$ csc-dim dim.cs -langversion:latest
+Microsoft (R) Visual C# Compiler version 42.42.42.42424 (<developer build>)
+Copyright (C) Microsoft Corporation. All rights reserved.
+
+dim.cs(20,26): error CS1061: 'Bar' does not contain a definition for 'X' and no extension method 'X' accepting a first argument of type 'Bar' could be found (are you missing a using directive or an assembly reference?)
+```
+
+(`csc-dim` is a special C# compiler distributed in the latest mono, which is anohter roslyn csc build which enabled C# 8 DIMs. We need `-langversion:latest` to actually use DIMs even with it.)
+
+You cannot call `new Bar ().X ()` because `X()` does not exist in `Bar`. In Java 8, `Bar.X()` is publicly accessible. In current C# 8.0 language specification, `Bar.X()` is **explicitly implemented** and **has no public API**. It's like existing non-DIMs that are not implicitly declared in a class.
+
+(It is explained at https://github.com/dotnet/csharplang/issues/288#issue-215243291 too. See "Concrete methods in interfaces".)
+
+It is actually argurable design, but that is another story. we're explaining only the fact part.
+
+It should be noted that we are under different circumstances than others:
+
+- We have no control over the API. We have no position to define API. Even Googlers don't especially in java.\* API.
+- Android API, or even Java 8 API, has grown up to convert non-DIMs to DIMs.
+- We have existing customers who have implemented existing Xamarin.Android interfaces.
+
+Therefore my investigation on C# 8.0 DIMs was in quite different direction from what others do/did.
+
+Let's see what kinf of default interface methods Android API has:
+
+- `java.lang.Iterable#spliterator()` is a DIM which was added at API Level 24 (Android N). Google had moved to OpenJDK class libraries at API Level 24 and there was a bunch of additions like this.
+- Similarly, `java.lang.Iterable#remove()` is a DIM, but it had existed before API Level 24 as non-DIM. Since this method was public, there would be customers who have used this method.
+
+
+Would there be any behavioral difference result in that Xamarin.Android cannot support DIMs? Not anything so far. 
+
+What happens if, some customer has code that uses this non-default version of the method, like:
+
+```
+public class MyIterator : Java.Lang.IIterator
+{
+	// (there must be customer implementation of Remove() because it was not default before)
+	public void Remove () { ... }
+}
+
+public void ReduceAndSkipSome (MyIterator iterator)
+{
+    IIterator i = iterator; // RValue can be anything. This is a PoC so just let it as is, but with explicit interface type.
+	while (i.HasNext ()) {
+		var current = i.Next ();
+		if (MatchesSomeCondition (current)
+			i.Remove (); // therefore it should still compile.
+    }
+}
+```
+
+This will work.
+
+What if once we replace non-DIM IIterator.Remove() with a DIM, and customer rebuilt project without touching any of their source code, will it invoke `MyIterator.Remove()` ? The answer is **yes**.  It is not `IIterator.Remove()` and it should still work just like it used to do.
+
+There won't be ABI breakage, but there is a problem that Java developers won't face. If a Xamarin.Android interface provides some DIMs and a third party library class `C` implements it without implicitly overriding it, the class is not as useful as one in Java, because of the reason I explained at first. There is no callable `new Bar().X()` where `X` is a DIM in `Foo` which `Bar` implements.
+
+To avoid that uselessness, the `C` developer needs to override ALL those DIMs. That's what current specification supporters claim developers to do. The current specification is likely the most consistent with the existing interface specification indeed.
+
+Another case Java developers would get stuck:
+
+```
+public interface IComparer
+{
+    int Compare (Object o1, Object o2);
+}
+public interface IList
+{
+    void Sort (IComparer comparer) { ... } // DIM
+}
+public class Vector : IList { ... } // implements everything in IList
+public class MyVector : Vector
+{
+    void IList.Sort (IComparer comparer) { ...} // ERROR!!
+}
+```
+
+This doesn't compile because "`MyVector` does not implement `IList`"... to make it compile, you will have to explicitly add `IList` as an implemented interface to `MyVector` declaration:
+
+```
+public class MyVector : Vector, IList { ... }
+```
+
+Then it will compile (and you don't have to implement non-DIMs in `IList` because `Vector` implements them). It is weird but that's how C# works.
+
+
+### What Xamarin.Android currently does
+
+In the stable releases as of now, we don't bind any "new" default interface methods because generating them as non-default interface methods means the interface will be messy to implement (for example, what if you are told "you are supposed to implement `forEachRemaining()` and `remove()` in all of your `Iterator` implementation classes" ?). It is safe to ignore them because they don't need implementation.
+
+On the other hand, we generate managed methods for default interface methods IF they had existed as non-DIM in the earlier API Levels. There is a supplemental reason for that: `Mono.Android.dll` is offered per API Level, but it is not only from the corresponding API Level. Each `Mono.Android.dll` is a result of "merging" APIs from the earlier API. It is to bring API consistency across API Levels (if you look for `api-merge` in `xamarin-android/src/Mono.Android/Mono.Android.targets` you'll see how it is done). With this API model, it kind of makes sense to keep non-DIM as is, regardless of whether it is DIM now or not.
+
+For example, `javax.security.auth.Destroyable#destroy()` is a DIM in API Level 24 or later, but we mark it as non-DIM because it had existed since API Level 1.
+
+
+### What Xamarin.Android will change
+
+We keep "already existed as non-DIMs" as is i.e. `Javax.Security.Auth.Destroyable.Destroy()` will remain DIM. I'm not sure if we will ever change that. This means Xamarin.Android application and library developers will be suffered from "extraneous work to implement some interface methods" to some extent.
+
+On the other hand, there will be totally new interface methods as DIMs such as `Java.Util.IIterator.ForEachRemaining()`.
+
+For non-abstract overrides such as `Java.Util.IPrimitiveIteratorOfDouble.ForEachRemaining()`, it will override the DIM as non-abstract, explicitly.
+
+For abstract overrides such as `Java.Util.IPrimitiveIterator.ForEachRemaining()`, it will override the DIM as abstract, explicitly.
+
+
diff --git a/Xamarin.Android-Tests.sln b/Xamarin.Android-Tests.sln
index 308a55fd1eb..31bb7178a37 100644
--- a/Xamarin.Android-Tests.sln
+++ b/Xamarin.Android-Tests.sln
@@ -76,6 +76,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance-Tests", "Perfor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "timing", "build-tools\timing\timing.csproj", "{37CAA28C-40BE-4253-BA68-CC5D7316A617}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.DefaultInterfaceMethods-Tests", "tests\CodeGen-Binding\Xamarin.Android.DefaultInterfaceMethods-Tests\Xamarin.Android.DefaultInterfaceMethods-Tests.csproj", "{80E5171A-56DF-48AC-8AD9-65028319C1B8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.DefaultInterfaceMethods-Lib", "tests\CodeGen-Binding\Xamarin.Android.DefaultInterfaceMethods-Lib\Xamarin.Android.DefaultInterfaceMethods-Lib.csproj", "{E2F0F78B-6088-4282-A49C-122EE28611FF}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		tests\Xamarin.Forms-Performance-Integration\Xamarin.Forms.Performance.Integration.projitems*{195be9c2-1f91-40dc-bd6d-de860bf083fb}*SharedItemsImports = 13
@@ -194,6 +198,14 @@ Global
 		{37CAA28C-40BE-4253-BA68-CC5D7316A617}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37CAA28C-40BE-4253-BA68-CC5D7316A617}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37CAA28C-40BE-4253-BA68-CC5D7316A617}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80E5171A-56DF-48AC-8AD9-65028319C1B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80E5171A-56DF-48AC-8AD9-65028319C1B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80E5171A-56DF-48AC-8AD9-65028319C1B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80E5171A-56DF-48AC-8AD9-65028319C1B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2F0F78B-6088-4282-A49C-122EE28611FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2F0F78B-6088-4282-A49C-122EE28611FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2F0F78B-6088-4282-A49C-122EE28611FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2F0F78B-6088-4282-A49C-122EE28611FF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -225,6 +237,8 @@ Global
 		{F4DAFD78-BE76-46C9-A1AD-85D8C91CD77B} = {9B63992C-2201-4BB0-BD00-D637B481A995}
 		{2DD1EE75-6D8D-4653-A800-0A24367F7F38} = {9B63992C-2201-4BB0-BD00-D637B481A995}
 		{37CAA28C-40BE-4253-BA68-CC5D7316A617} = {68B8E272-5B12-47AA-8923-550B9CE535C7}
+		{80E5171A-56DF-48AC-8AD9-65028319C1B8} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4}
+		{E2F0F78B-6088-4282-A49C-122EE28611FF} = {2EFFECF5-1CCA-4005-AE62-1D6F01C88DF4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8643CD20-B195-4919-8135-27549488237E}
diff --git a/external/Java.Interop b/external/Java.Interop
index 78f73018f0e..e6be186c23f 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 78f73018f0e440c80e47e21e009c6f493b7103ff
+Subproject commit e6be186c23f0843a1774bafe450f535be7129128
diff --git a/src/Mono.Android/Java.Nio.Channels/AsynchronousServerSocketChannel.cs b/src/Mono.Android/Java.Nio.Channels/AsynchronousServerSocketChannel.cs
new file mode 100644
index 00000000000..60f4aa526b5
--- /dev/null
+++ b/src/Mono.Android/Java.Nio.Channels/AsynchronousServerSocketChannel.cs
@@ -0,0 +1,21 @@
+#if ANDROID_26
+
+using System;
+using Java.Net;
+
+namespace Java.Nio.Channels
+{
+	partial class AsynchronousServerSocketChannel
+	{
+		INetworkChannel INetworkChannel.Bind (SocketAddress address)
+		{
+			return Bind (address);
+		}
+		INetworkChannel INetworkChannel.SetOption (ISocketOption option, Java.Lang.Object value)
+		{
+			return SetOption (option, value);
+		}
+	}
+}
+
+#endif
diff --git a/src/Mono.Android/Java.Nio.Channels/AsynchronousSocketChannel.cs b/src/Mono.Android/Java.Nio.Channels/AsynchronousSocketChannel.cs
new file mode 100644
index 00000000000..70cd94982c0
--- /dev/null
+++ b/src/Mono.Android/Java.Nio.Channels/AsynchronousSocketChannel.cs
@@ -0,0 +1,21 @@
+#if ANDROID_26
+
+using System;
+using Java.Net;
+
+namespace Java.Nio.Channels
+{
+	partial class AsynchronousSocketChannel
+	{
+		INetworkChannel INetworkChannel.Bind (SocketAddress address)
+		{
+			return Bind (address);
+		}
+		INetworkChannel INetworkChannel.SetOption (ISocketOption option, Java.Lang.Object value)
+		{
+			return SetOption (option, value);
+		}
+	}
+}
+
+#endif
diff --git a/src/Mono.Android/Java.Nio.Channels/DatagramChannel.cs b/src/Mono.Android/Java.Nio.Channels/DatagramChannel.cs
new file mode 100644
index 00000000000..9c567deee43
--- /dev/null
+++ b/src/Mono.Android/Java.Nio.Channels/DatagramChannel.cs
@@ -0,0 +1,17 @@
+using System;
+using Java.Net;
+
+namespace Java.Nio.Channels
+{
+	partial class DatagramChannel
+	{
+		INetworkChannel INetworkChannel.Bind (SocketAddress address)
+		{
+			return Bind (address);
+		}
+		INetworkChannel INetworkChannel.SetOption (ISocketOption option, Java.Lang.Object value)
+		{
+			return SetOption (option, value);
+		}
+	}
+}
diff --git a/src/Mono.Android/Java.Nio.Channels/ServerSocketChannel.cs b/src/Mono.Android/Java.Nio.Channels/ServerSocketChannel.cs
new file mode 100644
index 00000000000..994c3165f49
--- /dev/null
+++ b/src/Mono.Android/Java.Nio.Channels/ServerSocketChannel.cs
@@ -0,0 +1,17 @@
+using System;
+using Java.Net;
+
+namespace Java.Nio.Channels
+{
+	partial class ServerSocketChannel
+	{
+		INetworkChannel INetworkChannel.Bind (SocketAddress address)
+		{
+			return Bind (address);
+		}
+		INetworkChannel INetworkChannel.SetOption (ISocketOption option, Java.Lang.Object value)
+		{
+			return SetOption (option, value);
+		}
+	}
+}
diff --git a/src/Mono.Android/Java.Nio.Channels/SocketChannel.cs b/src/Mono.Android/Java.Nio.Channels/SocketChannel.cs
new file mode 100644
index 00000000000..573c6a2fad7
--- /dev/null
+++ b/src/Mono.Android/Java.Nio.Channels/SocketChannel.cs
@@ -0,0 +1,17 @@
+using System;
+using Java.Net;
+
+namespace Java.Nio.Channels
+{
+	partial class SocketChannel
+	{
+		INetworkChannel INetworkChannel.Bind (SocketAddress address)
+		{
+			return Bind (address);
+		}
+		INetworkChannel INetworkChannel.SetOption (ISocketOption option, Java.Lang.Object value)
+		{
+			return SetOption (option, value);
+		}
+	}
+}
diff --git a/src/Mono.Android/Java.Util/Spliterators.cs b/src/Mono.Android/Java.Util/Spliterators.cs
index d6a327dc480..99dbbe3de0c 100644
--- a/src/Mono.Android/Java.Util/Spliterators.cs
+++ b/src/Mono.Android/Java.Util/Spliterators.cs
@@ -1,4 +1,4 @@
-#if ANDROID_24
+#if false//ANDROID_24
 using System;
 using Android.Runtime;
 using Java.Interop;
@@ -6,7 +6,6 @@
 
 namespace Java.Util
 {
-	// FIXME: this should not be required to be hand-bound.
 	public partial class Spliterators
 	{
 		public partial class AbstractSpliterator
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index 2e805278a6a..f782fde347b 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -301,6 +301,7 @@
     <Compile Include="Java.Nio\Buffer.cs" />
     <Compile Include="Java.Nio\CharBuffer.cs" />
     <Compile Include="Java.Nio\FileChannel.cs" />
+    <Compile Include="Java.Nio.Channels\*.cs" />
     <Compile Include="Java.Security\IdentityScope.cs" />
     <Compile Include="Java.Util\Spliterators.cs" />
     <Compile Include="Java.Util.Concurrent.Atomic\AtomicInteger.cs" />
diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets
index f8242c06ada..1acde6c0f70 100644
--- a/src/Mono.Android/Mono.Android.targets
+++ b/src/Mono.Android/Mono.Android.targets
@@ -3,6 +3,10 @@
   <UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\xa-prep-tasks.dll"   TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" />
   <Import Project="..\..\build-tools\scripts\XAVersionInfo.targets" />
   <Import Project="Mono.Android.projitems" />
+  <PropertyGroup>
+    <CscToolPath>..\..\packages\xamarin.android.csc.dim.0.1.2\tools\</CscToolPath>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(IntermediateOutputPath)AssemblyInfo.cs" />
   </ItemGroup>
@@ -78,6 +82,7 @@
     <PropertyGroup>
       <Generator>"$(XAInstallPrefix)xbuild\Xamarin\Android\generator.exe"</Generator>
       <_GenFlags>--public --product-version=7</_GenFlags>
+      <_DefaultInterfaceMethods>--default-interface-methods</_DefaultInterfaceMethods>
       <_ApiLevel>--api-level=$(AndroidApiLevel)</_ApiLevel>
       <_Out>-o "$(IntermediateOutputPath)mcw"</_Out>
       <_Codegen>--codegen-target=XAJavaInterop1</_Codegen>
@@ -92,7 +97,7 @@
       <_Dirs>--enumdir=$(IntermediateOutputPath)mcw</_Dirs>
     </PropertyGroup>
     <Exec
-        Command="$(ManagedRuntime) $(Generator) $(_GenFlags) $(_ApiLevel) $(_Out) $(_Codegen) $(_Fixup) $(_Enums1) $(_Enums2) $(_Versions) $(_Annotations) $(_Assembly) $(_TypeMap) $(_Dirs) $(_Api)"
+        Command="$(ManagedRuntime) $(Generator) $(_GenFlags) $(_ApiLevel) $(_Out) $(_Codegen) $(_DefaultInterfaceMethods) $(_Fixup) $(_Enums1) $(_Enums2) $(_Versions) $(_Annotations) $(_Assembly) $(_TypeMap) $(_Dirs) $(_Api)"
     />
     <ItemGroup>
       <Compile Include="$(IntermediateOutputPath)mcw\**\*.cs" />
diff --git a/src/Mono.Android/metadata b/src/Mono.Android/metadata
index 1525b120dd0..a24cd51e720 100644
--- a/src/Mono.Android/metadata
+++ b/src/Mono.Android/metadata
@@ -1173,29 +1173,13 @@
   <!-- invariant method overrides fixup -->
   <attr path="/api/package[@name='android.icu.util']/class[@name='CECalendar']" name="visibility">public</attr>
 
-  <!-- FIXME: Enable below only after we enable NetworkChannel
-    
-  <attr path="/api/package[@name='java.nio.channels']/class[@name='DatagramChannel']/method[@name='bind']" name="managedReturn">Java.Nio.Channels.INetworkChannel</attr>
-  <attr path="/api/package[@name='java.nio.channels']/class[@name='SocketChannel']/method[@name='bind']" name="managedReturn">Java.Nio.Channels.INetworkChannel</attr>
-  <attr path="/api/package[@name='java.nio.channels']/class[@name='ServerSocketChannel']/method[@name='bind']" name="managedReturn">Java.Nio.Channels.INetworkChannel</attr>
-
-  Similar changed are needed for getOption() and setOption().
-  
-  At this state, it is impossible to generate bindings for
-  getOpion() and setOption() (generic methods).
-
-  "Fixing" this is either impossible by design, or impossible
-  because we cannot introduce API breakers, or impossible because
-  there are too many changes involved in generator code base.
-  
-  Manually bound API is still an option.
-
-  -->
-  
-  <remove-node path="/api/package[@name='java.nio.channels']/interface[@name='NetworkChannel']" /> 
-  <remove-node path="/api/package[@name='java.nio.channels']/class[@name='DatagramChannel']/implements[@name='java.nio.channels.NetworkChannel']" /> 
-  <remove-node path="/api/package[@name='java.nio.channels']/class[@name='SocketChannel']/implements[@name='java.nio.channels.NetworkChannel']" /> 
-  <remove-node path="/api/package[@name='java.nio.channels']/class[@name='ServerSocketChannel']/implements[@name='java.nio.channels.NetworkChannel']" /> 
+  <!-- attr path="/api/package[@name='java.nio.channels']/class[implements/@name='java.nio.channels.NetworkChannel']/method[@name='setOption']" name="managedReturn">Java.Nio.Channels.INetworkChannel</attr -->
+  <!-- Those classes don't have getOptions() implementation. Problem here is that the method only exists in NetworkChannel interface and it is not bound by design because it is a generic method.
+  As a workaround, remove the generic argument and redefine it as it's returning JLO. Note that we cannot just specify managedReturn because 'T' is still unknown type for generator. -->
+  <remove-node path="/api/package[@name='java.nio.channels']/interface[@name='NetworkChannel']/method/typeParameters" />
+  <attr path="/api/package[@name='java.nio.channels']/interface[@name='NetworkChannel']/method/parameter[@type='java.net.SocketOption&lt;T&gt;']" name="type">java.net.SocketOption</attr>
+  <attr path="/api/package[@name='java.nio.channels']/interface[@name='NetworkChannel']/method[@name='getOption']" name="return">Java.Lang.Object</attr>
+  <attr path="/api/package[@name='java.nio.channels']/interface[@name='NetworkChannel']/method[@name='setOption']/parameter[@type='T']" name="type">Java.Lang.Object</attr>
 
   <attr path="/api/package[@name='java.util.concurrent.atomic']/class[@name='Striped64']" name="visibility">public</attr>
 
@@ -1208,50 +1192,36 @@
   <attr path="/api/package[@name='java.util.concurrent']/class[@name='CompletableFuture']/method[@static='false' and starts-with (@return, 'java.util.concurrent.CompletableFuture') and @name!='toCompletableFuture']" name="managedReturn">Java.Util.Concurrent.ICompletionStage</attr>
 
   <!--
-  
-  Spliterator had brought TONS of issues that cannot really be easily resolved. Considering that those Java8 API is primarily useful
-  only for Java developers, they should not be regarded as major
-  binding blockers. So, just remove them.
-  
-  We had been removing EntityIterator for exactly same reason
-  (non-generic derived interfaces from generic interface, that has variant return values are regarded as our unsupported use of
-  generics; we slightly removed limitation by some manual metadata
-  fixes and .cs additions, but this is "unsupported" in principle.
-  
+  Spliterators brings some difficulty in generating expected methods due to
+  its conflicting overloads in erased-generic world, namely...
   -->
-
-  <remove-node path="/api/package[@name='java.util']/interface[starts-with (@name, 'Spliterator.Of')]" />
-
   <!--
-    This is more like a workaround for a generator issue - some
-    interface default method within generic types don't get marked
-    as override as expected. For example, some Spliterator.AbstractIntSpliterator#forEachRemaining() overload
-    (among many) isn't marked as override, while it should be.
-    
-    Here we are removing interface default method. Usually removing
-    interface method cannot be done as Java stub generator will
-    not emit required Java methods for the ACWs and then javac
-    will reject such incomplete interface implementation.
-    But here it is about default methods which don't have to be
-    necessarily implemented.
-    
-    Same goes for other spliterator methods, streams and
-    PrimitiveIterators.
-
-  <remove-node path="/api/package[@name='java.util']/interface[starts-with (@name, 'Spliterator.Of')]/method[@name='forEachRemaining']" />
+  1) The return value is generic argument and it is not respected here,
+  and thus treated as Java.Lang.Object. It needs to be fixed.
+  -->
+  <attr path="/api/package[@name='java.util']/interface[starts-with (@name, 'PrimitiveIterator.Of')]/method[@name='next']" name="managedReturn">Java.Lang.Object</attr>
+  <!--
+  2) same for these (but as ISpliterator)
   -->
+  <attr path="/api/package[@name='java.util']/interface[starts-with (@name, 'Spliterator.Of')]/method[@name='trySplit']" name="managedReturn">Java.Util.ISpliterator</attr>
+  <attr path="/api/package[@name='java.util']/class[starts-with (@name, 'Spliterators.Abstract')]/method[@name='trySplit']" name="managedReturn">Java.Util.ISpliterator</attr>
+  <!--
+  3) tryAdvance() and trySplit() - these methods are derived by IntConsumer/LongConsumer/DoubleConsumer with respective specialized type, so they should be regarded as implemented.
+  Since these base methods result in binding to Java.Lang.Object which kills the benefit of those specialized overrides, they had better be removed. -->
+  <remove-node path="/api/package[@name='java.util']/interface[@name='Spliterator.OfPrimitive']/method[@name='tryAdvance' or @name='trySplit']" />
 
+  <!--
+  Stream interfaces.
+  -->
   <attr path="/api/package[@name='java.util.stream']/interface[@name='IntStream' or @name='LongStream' or @name='DoubleStream']/method[@name='spliterator']" name="managedReturn">Java.Util.ISpliterator</attr>
   <attr path="/api/package[@name='java.util.stream']/interface[@name='IntStream' or @name='LongStream' or @name='DoubleStream']/method[@name='sequential' or @name='parallel']" name="managedReturn">Java.Lang.Object</attr>
   <attr path="/api/package[@name='java.util.stream']/interface[@name='IntStream' or @name='LongStream' or @name='DoubleStream']/method[@name='iterator']" name="managedReturn">Java.Util.IIterator</attr>
 
-  <attr path="/api/package[@name='java.util']/interface[starts-with (@name, 'PrimitiveIterator.Of')]/method[@name='next']" name="managedReturn">Java.Lang.Object</attr>
-  
-  <!--
-  The return value is generic argument and it is not respected here,
-  and thus treated as Java.Lang.Object. It needs to be fixed.
-  --> 
-  <attr path="/api/package[@name='java.util']/class[starts-with (@name, 'Spliterators.Abstract')]/method[@name='trySplit']" name="managedReturn">Java.Util.ISpliterator</attr>
+  <!-- FIXME: they had better be remapped to managedReturn of Spliterator(without .OfXYZ). So far there is BaseStream#spliterator() and removing them is harmless. -->
+  <remove-node path="/api/package[@name='java.util.stream']/interface[@name='DoubleStream']/method[@name='spliterator']" />
+  <remove-node path="/api/package[@name='java.util.stream']/interface[@name='IntStream']/method[@name='spliterator']" />
+  <remove-node path="/api/package[@name='java.util.stream']/interface[@name='LongStream']/method[@name='spliterator']" />
+
 
   <attr path="/api/package[@name='android.service.quicksettings']" name="managedName">Android.Service.QuickSettings</attr>
 
@@ -1320,8 +1290,10 @@
   <attr path="/api/package[@name='android.media']/class[@name='AudioFocusRequest']" name="managedName" api-since="26">AudioFocusRequestClass</attr>
 
   <!-- FIXME: fix build and enable these packages -->
-  <remove-node path="/api/package[@name='java.time']" api-since="26" />
   <remove-node path="/api/package[@name='java.time.chrono']" api-since="26" />
+
+  <attr path="/api/package[@name='java.time']/class[implements/@name='java.time.temporal.Temporal']/method[(@name='plus' or @name='with')][ count(parameter)=2]" name="managedReturn">Java.Time.Temporal.ITemporal</attr>
+  
   
   <!-- FIXME: fix build and enable this method -->
   <remove-node path="/api/package[@name='android.text']/class[@name='TextUtils']/method[@name='listEllipsize']" api-since="26" />
@@ -1389,6 +1361,10 @@
   -->
   <attr path="/api/package[@name='android.graphics']/class[@name='Color']" name="managedName">ColorObject</attr>
 
+  <!-- new addition to API 26 fixup due to DIM support -->
+  <attr path="/api/package[@name='android.animation']/interface[@name='Animator.AnimatorListener']/method[@name='onAnimationStart' and count(parameter)=2]" name="managedName">AnimationStart2</attr>
+  <attr path="/api/package[@name='android.animation']/interface[@name='Animator.AnimatorListener']/method[@name='onAnimationEnd' and count(parameter)=2]" name="managedName">AnimationEnd2</attr>
+
   <!-- API Level 27 -->
 
   <!-- detected field-property conflicts (e.g. see bug #60069)
@@ -1409,4 +1385,23 @@
   <remove-node path="/api/package[@name='android.text']/class[@name='PrecomputedText']" />
   <attr path="/api/package[@name='android.provider']/class[@name='Telephony.CarrierId']/field[@name='CARRIER_ID']" name="managedName">CarrierIdField</attr>
 
+  <!-- FIXME: for now generator cannot "unmark" final DIM methods as *non*-sealed C# DIM methods.
+   Attempt to unmark them result in various ABI breakage, which needs non-trivial fixes. 
+   So far this is the only one in android.jar, hopefully there aren't many.
+   -->
+  <attr path="/api/package[@name='java.util']/class[@name='PriorityQueue']/method[@name='spliterator']" name="final">false</attr>
+
+  <!--
+	This should not really be required. However current generator has
+	limitation that it has to generate such methods in its {implementing
+	interfaces} that contains {{any parameter or a return value} that is
+	of generic type} as explicitly implemented,
+	regardless of whether the method contains generic parameters or not.
+	
+	This kind of problem can be workarounded by removing generic arguments from the parameters and the return type.
+	
+	Spliterator itself is not suffered from that, but Spliterators.AbstractSpliterator is.
+  -->
+  <attr path="/api/package[@name='java.util']/interface[@name='Spliterator']/method[@name='tryAdvance']/parameter[1]" name="type">java.util.function.Consumer</attr>
+
 </metadata>
diff --git a/src/Mono.Android/packages.config b/src/Mono.Android/packages.config
new file mode 100644
index 00000000000..940176f8108
--- /dev/null
+++ b/src/Mono.Android/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="xamarin.android.csc.dim" version="0.1.2" targetFramework="monoandroid10" />
+</packages>
+
diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FixAbstractMethodsStep.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FixAbstractMethodsStep.cs
index 101ecc5052b..32e582c0eef 100644
--- a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FixAbstractMethodsStep.cs
+++ b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FixAbstractMethodsStep.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 using Mono.Cecil;
 
@@ -163,7 +164,7 @@ bool FixAbstractMethods (TypeDefinition type)
 				if (ifaceDef.HasGenericParameters)
 					continue;
 
-				foreach (var iMethod in ifaceDef.Methods) {
+				foreach (var iMethod in ifaceDef.Methods.Where (m => m.IsAbstract)) {
 					bool exists = false;
 
 					foreach (var tMethod in typeMethods) {
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Generator.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Generator.cs
index e3555270254..9fb962f1ca3 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/Generator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/Generator.cs
@@ -41,6 +41,8 @@ public class BindingsGenerator : AndroidToolTask
 
 		public bool UseShortFileNames { get; set; }
 
+		public bool EnableDefaultInterfaceMethods { get; set; }
+
 		// apart from ReferencedManagedLibraries we need it to find mscorlib.dll.
 		[Required]
 		public string MonoAndroidFrameworkDirectories { get; set; }
@@ -64,6 +66,7 @@ public override bool Execute ()
 			Log.LogDebugMessage ("  AssemblyName: {0}", AssemblyName);
 			Log.LogDebugMessage ("  AndroidApiLevel: {0}", AndroidApiLevel);
 			Log.LogDebugMessage ("  UseShortFileNames: {0}", UseShortFileNames);
+			Log.LogDebugMessage ("  EnableDefaultInterfaceMethods: {0}", EnableDefaultInterfaceMethods);
 			Log.LogDebugTaskItems ("  TransformFiles:", TransformFiles);
 			Log.LogDebugTaskItems ("  ReferencedManagedLibraries:", ReferencedManagedLibraries);
 			Log.LogDebugTaskItems ("  AnnotationsZipFiles:", AnnotationsZipFiles);
@@ -119,6 +122,8 @@ protected override string GenerateCommandLineCommands ()
 			cmd.AppendSwitchIfNotNull ("--enumdir=", EnumDirectory);
 			cmd.AppendSwitchIfNotNull ("--enummetadata=", EnumMetadataDirectory);
 			cmd.AppendSwitchIfNotNull ("--assembly=", AssemblyName);
+			if (EnableDefaultInterfaceMethods)
+				cmd.AppendSwitch ("--default-interface-methods");
 
 			if (!NoStdlib) {
 				string fxpath = MonoAndroidFrameworkDirectories.Split (';').First (p => new DirectoryInfo (p).GetFiles ("mscorlib.dll").Any ());
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs
index ff18627c040..dd08038bc48 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs
@@ -446,5 +446,59 @@ public String greet (String name, java.util.Date date)
 				Assert.IsTrue (xml.Contains ("<param name=\"name\"> - name to display.</param>"), "missing doc");
 			}
 		}
+
+		[Test]
+		[TestCaseSource ("ClassParseOptions")]
+		public void BindDefaultInterfaceMethods (string classParser)
+		{
+			var proj = new XamarinAndroidBindingProject () {
+				IsRelease = true,
+			};
+			proj.Packages.Add (new Package { Id = "xamarin.android.csc.dim", Version = "0.1.2" });
+			// The sources for the .jar is in the jar itself.
+			string classesJarBase64 = @"
+UEsDBBQACAgIANWk6UwAAAAAAAAAAAAAAAAJAAQATUVUQS1JTkYv/soAAAMAUEsHCAAAAAACAAAAAAA
+AAFBLAwQUAAgICADVpOlMAAAAAAAAAAAAAAAAFAAAAE1FVEEtSU5GL01BTklGRVNULk1G803My0xLLS
+7RDUstKs7Mz7NSMNQz4OVyLkpNLElN0XWqBAlY6BnEG5obKmj4FyUm56QqOOcXFeQXJZYA1WvycvFyA
+QBQSwcIFGFrLUQAAABFAAAAUEsDBAoAAAgAAK2k6UwAAAAAAAAAAAAAAAAEAAAAY29tL1BLAwQKAAAI
+AACtpOlMAAAAAAAAAAAAAAAADAAAAGNvbS94YW1hcmluL1BLAwQKAAAIAACwpOlMAAAAAAAAAAAAAAA
+AEQAAAGNvbS94YW1hcmluL3Rlc3QvUEsDBBQACAgIAJmk6UwAAAAAAAAAAAAAAAAuAAAAY29tL3hhbW
+FyaW4vdGVzdC9EZWZhdWx0SW50ZXJmYWNlTWV0aG9kcy5jbGFzc3WOvU7DMBSFjxsnKeWnXUE8QLrgh
+ScAhBSJnwHE7qQ3JVUSC8dGFc/EwsrAA/BQiOuqLKnw8Pn4+LuWv38+vwCcY5biKMVUIKqMYWbzXEBe
+mgUJTG/qju58W5B91EXDTbIkd6HtX3jj0G+DzPL5E28v3q8FJg/G25Ku6zB1ekWV9o3LO0e20iXdkns
+2i/5spV+1QFaaVq11q23dKUe9U//4ArMwoRrdLdV9saLSJQICI4QVc4ogmTGfThBugFH0zuR/MpNNE7
+x015NDL3C868VDL2XuYbL1joMTjI+BNpYC+/xcaA820uEvUEsHCIw1aijpAAAAhQEAAFBLAwQUAAgIC
+ACYpOlMAAAAAAAAAAAAAAAAHAAAAERlZmF1bHRJbnRlcmZhY2VNZXRob2RzLmphdmF1zLEOwiAQBuCd
+p7hRl0Zd2YyLgw9xwlGJFCocTWPTdxdSHarxxv///utR3bElUKFrRuwwWt8wJZZC9PnqrALrmaJBRXA
+ig9nx+RNciG9BJzEJKKeXtnowIcBmCxNE4hw97CTMP6glPmJcuf1f91y5w7cbgtWQ3rCOBnSZymJhNX
+nkPJYnUsziBVBLBwgzfz2miQAAAPUAAABQSwECFAAUAAgICADVpOlMAAAAAAIAAAAAAAAACQAEAAAAA
+AAAAAAAAAAAAAAATUVUQS1JTkYv/soAAFBLAQIUABQACAgIANWk6UwUYWstRAAAAEUAAAAUAAAAAAAA
+AAAAAAAAAD0AAABNRVRBLUlORi9NQU5JRkVTVC5NRlBLAQIKAAoAAAgAAK2k6UwAAAAAAAAAAAAAAAA
+EAAAAAAAAAAAAAAAAAMMAAABjb20vUEsBAgoACgAACAAAraTpTAAAAAAAAAAAAAAAAAwAAAAAAAAAAA
+AAAAAA5QAAAGNvbS94YW1hcmluL1BLAQIKAAoAAAgAALCk6UwAAAAAAAAAAAAAAAARAAAAAAAAAAAAA
+AAAAA8BAABjb20veGFtYXJpbi90ZXN0L1BLAQIUABQACAgIAJmk6UyMNWoo6QAAAIUBAAAuAAAAAAAA
+AAAAAAAAAD4BAABjb20veGFtYXJpbi90ZXN0L0RlZmF1bHRJbnRlcmZhY2VNZXRob2RzLmNsYXNzUEs
+BAhQAFAAICAgAmKTpTDN/PaaJAAAA9QAAABwAAAAAAAAAAAAAAAAAgwIAAERlZmF1bHRJbnRlcmZhY2
+VNZXRob2RzLmphdmFQSwUGAAAAAAcABwDOAQAAVgMAAAAA
+";
+			proj.Jars.Add (new AndroidItem.EmbeddedJar ("dim.jar") {
+				BinaryContent = () => Convert.FromBase64String (classesJarBase64)
+			});
+			proj.AndroidClassParser = classParser;
+			proj.SetProperty ("CscToolPath", "$(MSBuildThisFileDirectory)\\..\\packages\\xamarin.android.csc.dim.0.1.2\\tools");
+			proj.SetProperty ("AndroidEnableDefaultInterfaceMethods", "True");
+			proj.SetProperty ("LangVersion", "latest");
+			using (var b = CreateDllBuilder (Path.Combine ("temp", TestName), false, false)) {
+				proj.NuGetRestore (b.ProjectDirectory);
+				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
+				string asmpath = Path.GetFullPath (Path.Combine (Path.GetDirectoryName (new Uri (GetType ().Assembly.CodeBase).LocalPath), b.ProjectDirectory, b.Output.OutputPath, (proj.AssemblyName ?? proj.ProjectName) + ".dll"));
+				Assert.IsTrue (File.Exists (asmpath), "assembly does not exist");
+				var cs = b.Output.GetIntermediaryAsText (Path.Combine ("generated", "src", "Com.Xamarin.Test.IDefaultInterfaceMethods.cs"));
+				Assert.IsTrue (cs.Contains ("int Quux ();"), "Quux not generated.");
+				Assert.IsTrue (cs.Contains ("virtual unsafe int Foo ()"), "Foo not generated.");
+				Assert.IsTrue (cs.Contains ("virtual unsafe int Bar {"), "Bar not generated.");
+				Assert.IsTrue (cs.Contains ("set {"), "(Baz) setter not generated.");
+			}
+		}
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets
index 2fdb17639ba..efb301d68ac 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets
@@ -489,6 +489,7 @@ Copyright (C) 2012 Xamarin Inc. All rights reserved.
       ToolPath="$(MonoAndroidToolsDirectory)"
       ToolExe="$(BindingsGeneratorToolExe)"
       UseShortFileNames="$(UseShortGeneratorFileNames)"
+      EnableDefaultInterfaceMethods="$(AndroidEnableDefaultInterfaceMethods)"
     />
 
     <!-- Write a flag so we won't redo this target if nothing changed -->
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Additions/AboutAdditions.txt b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Additions/AboutAdditions.txt
new file mode 100644
index 00000000000..c511f1d4ee1
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Additions/AboutAdditions.txt
@@ -0,0 +1,48 @@
+Additions allow you to add arbitrary C# to the generated classes
+before they are compiled.  This can be helpful for providing convenience
+methods or adding pure C# classes.
+
+== Adding Methods to Generated Classes ==
+
+Let's say the library being bound has a Rectangle class with a constructor
+that takes an x and y position, and a width and length size.  It will look like
+this:
+
+public partial class Rectangle
+{
+    public Rectangle (int x, int y, int width, int height)
+	{
+	    // JNI bindings
+	}
+}
+
+Imagine we want to add a constructor to this class that takes a Point and
+Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
+with a partial class containing our new method:
+
+public partial class Rectangle
+{
+    public Rectangle (Point location, Size size) :
+	    this (location.X, location.Y, size.Width, size.Height)
+	{
+	}
+}
+
+At compile time, the additions class will be added to the generated class
+and the final assembly will a Rectangle class with both constructors.
+
+
+== Adding C# Classes ==
+
+Another thing that can be done is adding fully C# managed classes to the
+generated library.  In the above example, let's assume that there isn't a
+Point class available in Java or our library.  The one we create doesn't need
+to interact with Java, so we'll create it like a normal class in C#.
+
+By adding a Point.cs file with this class, it will end up in the binding library:
+
+public class Point
+{
+    public int X { get; set; }
+	public int Y { get; set; }
+}
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Jars/AboutJars.txt b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Jars/AboutJars.txt
new file mode 100644
index 00000000000..e833d78bc58
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Jars/AboutJars.txt
@@ -0,0 +1,36 @@
+This directory is for Android .jars.
+
+There are 4 types of jars that are supported:
+
+== Input Jar and Embedded Jar ==
+
+This is the jar that bindings should be generated for.
+
+For example, if you were binding the Google Maps library, this would
+be Google's "maps.jar".
+
+The difference between EmbeddedJar and InputJar is, EmbeddedJar is to be
+embedded in the resulting dll as EmbeddedResource, while InputJar is not.
+There are couple of reasons you wouldn't like to embed the target jar
+in your dll (the ones that could be internally loaded by <uses-library>
+feature e.g. maps.jar, or you cannot embed jars that are under some
+proprietary license).
+
+Set the build action for these jars in the properties page to "InputJar".
+
+
+== Reference Jar and Embedded Reference Jar ==
+
+These are jars that are referenced by the input jar.  C# bindings will
+not be created for these jars.  These jars will be used to resolve
+types used by the input jar.
+
+NOTE: Do not add "android.jar" as a reference jar.  It will be added automatically
+based on the Target Framework selected.
+
+Set the build action for these jars in the properties page to "ReferenceJar".
+
+"EmbeddedJar" works like "ReferenceJar", but like "EmbeddedJar", it is
+embedded in your dll. But at application build time, they are not included
+in the final apk, like ReferenceJar files.
+
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Jars/DefaultInterfaceMethods.java b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Jars/DefaultInterfaceMethods.java
new file mode 100644
index 00000000000..84a310f5c54
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Jars/DefaultInterfaceMethods.java
@@ -0,0 +1,10 @@
+package com.xamarin.test;
+
+public interface DefaultInterfaceMethods
+{
+    default int foo () { return 0; }
+    default int getBar () { return 1; }
+    default int getBaz () { return 2; }
+    default void setBaz (int value) { }
+    default int toImplement () { throw new UnsupportedOperationException (); }
+}
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Jars/ImplementedClass.java b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Jars/ImplementedClass.java
new file mode 100644
index 00000000000..4feeb9c2a8a
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Jars/ImplementedClass.java
@@ -0,0 +1,6 @@
+package com.xamarin.test;
+
+public class ImplementedClass implements DefaultInterfaceMethods
+{
+    public int toImplement () { return -1; }
+}
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Properties/AssemblyInfo.cs b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..895af20109e
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Properties/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Android.App;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle ("Xamarin.Android.DefaultInterfaceMethods-Lib")]
+[assembly: AssemblyDescription ("")]
+[assembly: AssemblyConfiguration ("")]
+[assembly: AssemblyCompany ("")]
+[assembly: AssemblyProduct ("")]
+[assembly: AssemblyCopyright ("${AuthorCopyright}")]
+[assembly: AssemblyTrademark ("")]
+[assembly: AssemblyCulture ("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion ("1.0.0")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Transforms/EnumFields.xml b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Transforms/EnumFields.xml
new file mode 100644
index 00000000000..b95f58ccd8c
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Transforms/EnumFields.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<enum-field-mappings>
+    <!--
+  This example converts the constants Fragment_id, Fragment_name,
+  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
+  to an enum called Android.Support.V4.App.FragmentTagType with values
+  Id, Name, and Tag.
+  
+  <mapping clr-enum-type="Android.Support.V4.App.FragmentTagType" jni-class="android/support/v4/app/FragmentActivity$FragmentTag">
+    <field clr-name="Id" jni-name="Fragment_id" value="1" />
+    <field clr-name="Name" jni-name="Fragment_name" value="0" />
+    <field clr-name="Tag" jni-name="Fragment_tag" value="2" />
+  </type>
+
+  Notes:
+  - An optional "bitfield" attribute marks the enum type with [Flags].
+  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
+  -->
+</enum-field-mappings>
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Transforms/EnumMethods.xml b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Transforms/EnumMethods.xml
new file mode 100644
index 00000000000..c65a473ca7a
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Transforms/EnumMethods.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<enum-method-mappings>
+    <!--
+  This example changes the Java method:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
+  to be:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
+  when bound in C#.
+
+  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
+    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
+  </mapping>
+
+  Notes:
+  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
+  - To change the type of the return value, use "return" as the parameter name.
+  - The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project.
+  -->
+</enum-method-mappings>
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Transforms/Metadata.xml b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Transforms/Metadata.xml
new file mode 100644
index 00000000000..8f3bde759f9
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Transforms/Metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+    <!--
+  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
+  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
+  
+  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
+  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
+  -->
+</metadata>
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Xamarin.Android.DefaultInterfaceMethods-Lib.csproj b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Xamarin.Android.DefaultInterfaceMethods-Lib.csproj
new file mode 100644
index 00000000000..78ff7a2845c
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/Xamarin.Android.DefaultInterfaceMethods-Lib.csproj
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\name.atsushieno.xamarin.android.buildenhancer.1.1.7\build\name.atsushieno.xamarin.android.buildenhancer.props" Condition="Exists('..\..\..\packages\name.atsushieno.xamarin.android.buildenhancer.1.1.7\build\name.atsushieno.xamarin.android.buildenhancer.props')" />
+  <Import Project="..\..\..\packages\xamarin.android.csc.dim.0.1.2\build\xamarin.android.csc.dim.props" Condition="Exists('..\..\..\packages\xamarin.android.csc.dim.0.1.2\build\xamarin.android.csc.dim.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{E2F0F78B-6088-4282-A49C-122EE28611FF}</ProjectGuid>
+    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Xamarin.Android.DefaultInterfaceMethodsLib</RootNamespace>
+    <AssemblyName>Xamarin.Android.DefaultInterfaceMethods-Lib</AssemblyName>
+    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+    <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidEnableDefaultInterfaceMethods>True</AndroidEnableDefaultInterfaceMethods>
+    <LangVersion>Latest</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Additions\AboutAdditions.txt" />
+    <None Include="Jars\AboutJars.txt" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Transforms\EnumFields.xml" />
+    <TransformFile Include="Transforms\EnumMethods.xml" />
+    <TransformFile Include="Transforms\Metadata.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <BindingJavaSource Include="Jars\DefaultInterfaceMethods.java" />
+    <BindingJavaSource Include="Jars\ImplementedClass.java" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
+  <Import Project="..\..\..\packages\xamarin.android.csc.dim.0.1.2\build\xamarin.android.csc.dim.targets" Condition="Exists('..\..\..\packages\xamarin.android.csc.dim.0.1.2\build\xamarin.android.csc.dim.targets')" />
+  <Import Project="..\..\..\packages\name.atsushieno.xamarin.android.buildenhancer.1.1.7\build\name.atsushieno.xamarin.android.buildenhancer.targets" Condition="Exists('..\..\..\packages\name.atsushieno.xamarin.android.buildenhancer.1.1.7\build\name.atsushieno.xamarin.android.buildenhancer.targets')" />
+</Project>
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/packages.config b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/packages.config
new file mode 100644
index 00000000000..ef211d7c05d
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Lib/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="name.atsushieno.xamarin.android.buildenhancer" version="1.1.7" targetFramework="monoandroid90" />
+  <package id="xamarin.android.csc.dim" version="0.1.2" targetFramework="monoandroid90" />
+</packages>
\ No newline at end of file
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Assets/AboutAssets.txt b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Assets/AboutAssets.txt
new file mode 100644
index 00000000000..a9b0638eb1b
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Assets/AboutAssets.txt
@@ -0,0 +1,19 @@
+Any raw assets you want to be deployed with your application can be placed in
+this directory (and child directories) and given a Build Action of "AndroidAsset".
+
+These files will be deployed with your package and will be accessible using Android's
+AssetManager, like this:
+
+public class ReadAsset : Activity
+{
+	protected override void OnCreate (Bundle bundle)
+	{
+		base.OnCreate (bundle);
+
+		InputStream input = Assets.Open ("my_asset.txt");
+	}
+}
+
+Additionally, some Android functions will automatically load asset files:
+
+Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/MainActivity.cs b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/MainActivity.cs
new file mode 100644
index 00000000000..1e1ec957d6c
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/MainActivity.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Reflection;
+
+using Android.App;
+using Android.OS;
+using Android.Runtime;
+using Com.Xamarin.Test;
+using Java.Interop;
+using Xamarin.Android.NUnitLite;
+
+namespace Xamarin.Android.DefaultInterfaceMethodsTests
+{
+	[Activity (Label = "Xamarin.Android.DefaultInterfaceMethods-Tests", MainLauncher = true)]
+	public class MainActivity : TestSuiteActivity
+	{
+		protected override void OnCreate (Bundle bundle)
+		{
+			// tests can be inside the main assembly
+			AddTest (Assembly.GetExecutingAssembly ());
+			// or in any reference assemblies
+			// AddTest (typeof (Your.Library.TestClass).Assembly);
+
+			// Once you called base.OnCreate(), you cannot add more assemblies.
+			base.OnCreate (bundle);
+		}
+	}
+}
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Properties/AndroidManifest.xml b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Properties/AndroidManifest.xml
new file mode 100644
index 00000000000..be0ab0ee935
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Properties/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Xamarin.Android.DefaultInterfaceMethods_Tests">
+	<uses-sdk />
+	<application android:label="Xamarin.Android.DefaultInterfaceMethods-Tests"></application>
+</manifest>
\ No newline at end of file
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Properties/AssemblyInfo.cs b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..a5ecc52af40
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Android.App;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle ("Xamarin.Android.DefaultInterfaceMethods-Tests")]
+[assembly: AssemblyDescription ("")]
+[assembly: AssemblyConfiguration ("")]
+[assembly: AssemblyCompany ("")]
+[assembly: AssemblyProduct ("")]
+[assembly: AssemblyCopyright ("${AuthorCopyright}")]
+[assembly: AssemblyTrademark ("")]
+[assembly: AssemblyCulture ("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion ("1.0.0")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/AboutResources.txt b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/AboutResources.txt
new file mode 100644
index 00000000000..10f52d46021
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/AboutResources.txt
@@ -0,0 +1,44 @@
+Images, layout descriptions, binary blobs and string dictionaries can be included 
+in your application as resource files.  Various Android APIs are designed to 
+operate on the resource IDs instead of dealing with images, strings or binary blobs 
+directly.
+
+For example, a sample Android app that contains a user interface layout (main.axml),
+an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
+would keep its resources in the "Resources" directory of the application:
+
+Resources/
+    drawable/
+        icon.png
+
+    layout/
+        main.axml
+
+    values/
+        strings.xml
+
+In order to get the build system to recognize Android resources, set the build action to
+"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
+instead operate on resource IDs.  When you compile an Android application that uses resources, 
+the build system will package the resources for distribution and generate a class called "R" 
+(this is an Android convention) that contains the tokens for each one of the resources 
+included. For example, for the above Resources layout, this is what the R class would expose:
+
+public class R {
+    public class drawable {
+        public const int icon = 0x123;
+    }
+
+    public class layout {
+        public const int main = 0x456;
+    }
+
+    public class strings {
+        public const int first_string = 0xabc;
+        public const int second_string = 0xbcd;
+    }
+}
+
+You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
+to reference the layout/main.axml file, or R.strings.first_string to reference the first 
+string in the dictionary file values/strings.xml.
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-hdpi/Icon.png b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-hdpi/Icon.png
new file mode 100644
index 00000000000..f4c804644c5
Binary files /dev/null and b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-hdpi/Icon.png differ
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-mdpi/Icon.png b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-mdpi/Icon.png
new file mode 100644
index 00000000000..ef1e1ee7dc3
Binary files /dev/null and b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-mdpi/Icon.png differ
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-xhdpi/Icon.png b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-xhdpi/Icon.png
new file mode 100644
index 00000000000..b7e2e57aa90
Binary files /dev/null and b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-xhdpi/Icon.png differ
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-xxhdpi/Icon.png b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-xxhdpi/Icon.png
new file mode 100644
index 00000000000..8d20a38d178
Binary files /dev/null and b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-xxhdpi/Icon.png differ
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-xxxhdpi/Icon.png b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-xxxhdpi/Icon.png
new file mode 100644
index 00000000000..6d9919c41a3
Binary files /dev/null and b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Resources/mipmap-xxxhdpi/Icon.png differ
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/TestsSample.cs b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/TestsSample.cs
new file mode 100644
index 00000000000..84f8094ddf5
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/TestsSample.cs
@@ -0,0 +1,22 @@
+using System;
+using Com.Xamarin.Test;
+using NUnit.Framework;
+
+namespace Xamarin.Android.DefaultInterfaceMethodsTests
+{
+	[TestFixture]
+	public class DimTest
+	{
+		[Test]
+		public void TestCSharp8DefaultInterfaceMethods ()
+		{
+			// C# 8 syntax is awkward.
+			// If you use "var" then it is declared as the class, and fails to resolve.
+			// Those default interface methods are only callable via interface!
+			IDefaultInterfaceMethods c = new ImplementedClass ();
+			Assert.AreEqual (0, c.Foo (), "#1");
+			Assert.AreEqual (1, c.Bar, "#2");
+			Assert.AreEqual (-1, c.ToImplement (), "#3");
+		}
+	}
+}
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Xamarin.Android.DefaultInterfaceMethods-Tests.csproj b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Xamarin.Android.DefaultInterfaceMethods-Tests.csproj
new file mode 100644
index 00000000000..6859e10fda4
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/Xamarin.Android.DefaultInterfaceMethods-Tests.csproj
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\xamarin.android.csc.dim.0.1.2\build\xamarin.android.csc.dim.props" Condition="Exists('..\..\..\packages\xamarin.android.csc.dim.0.1.2\build\xamarin.android.csc.dim.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{80E5171A-56DF-48AC-8AD9-65028319C1B8}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Xamarin.Android.DefaultInterfaceMethodsTests</RootNamespace>
+    <AssemblyName>Xamarin.Android.DefaultInterfaceMethods-Tests</AssemblyName>
+    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <AndroidApplication>True</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+    <AndroidResgenClass>Resource</AndroidResgenClass>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <LangVersion>Latest</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <ExternalConsole>false</ExternalConsole>
+    <MandroidI18n></MandroidI18n>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="Xamarin.Android.NUnitLite" />
+    <Reference Include="Java.Interop" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MainActivity.cs" />
+    <Compile Include="TestsSample.cs" />
+    <Compile Include="Resources\Resource.designer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AboutResources.txt" />
+    <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-hdpi\Icon.png" />
+    <AndroidResource Include="Resources\mipmap-mdpi\Icon.png" />
+    <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png" />
+    <AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png" />
+    <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xamarin.Android.DefaultInterfaceMethods-Lib\Xamarin.Android.DefaultInterfaceMethods-Lib.csproj">
+      <Project>{E2F0F78B-6088-4282-A49C-122EE28611FF}</Project>
+      <Name>Xamarin.Android.DefaultInterfaceMethods-Lib</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+  <Import Project="..\..\..\packages\xamarin.android.csc.dim.0.1.2\build\xamarin.android.csc.dim.targets" Condition="Exists('..\..\..\packages\xamarin.android.csc.dim.0.1.2\build\xamarin.android.csc.dim.targets')" />
+</Project>
diff --git a/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/packages.config b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/packages.config
new file mode 100644
index 00000000000..7b2eb74810c
--- /dev/null
+++ b/tests/CodeGen-Binding/Xamarin.Android.DefaultInterfaceMethods-Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="xamarin.android.csc.dim" version="0.1.2" targetFramework="monoandroid90" />
+</packages>
\ No newline at end of file