Follow-up patch, including a test, committed as attached.

FX