am 7bc855c8: Merge "Add a test for bug 71369"

* commit '7bc855c89a147c754b3d3367d9313a422ee1c277':
  Add a test for bug 71369