Add regression test for #546