more interop data
Merge branch 'master' into google_code

[ci skip]