Add regression test for #2690