Java

sync recent .net changes to java