Merge "Add testcase for issue34613"