test to reproduce and isolate #187. Disabled for now until impact can be assessed.
Merge branch 'master' into android-preview