Merge "Add testcase for issue 35933"