Issue #283: add tests cases for Issue #206 and fold Issue #206 into Issue #283