Bad cherry-pick again from me. Fixing the test case that needs to be 4.1 compatible.
Attach a file by drag & drop or click to upload