Merge "Add testcase for issue 22345"