Merge "Add a test for bug 71369"