Merge "Add testcase for issue 41770"