Merge "Add a test for reproducing bug/1651064"