am c27a31e3: Merge "Add unit test for issue 64563"

* commit 'c27a31e3c990abb48139b546a6eef94e8ba9052e':
  Add unit test for issue 64563