Merge "Add unit test for issue 64563"