Merge "Binder: update bug #s for Java-only features" into main