Merge "Add testcase for issue 40625"