Update repro project with fix

Tested a fix with this repro project; this fix must be enabled by a
configuration setting.
See README.md for more details.
Merge branch 'tmp'