Add test for Issue 18619