expanded the test case with a piece that needs the more-complete fix. I'll backport this to 2.3 maint.
Attach a file by drag & drop or click to upload
