Merge "Add testcase for issue 20862"