Add a testcase for PR 84821