Add regression test for PR15823