Merge branch 'tl/userdiff-csharp-async'