This commit can be cherry picked to 6.0 only if we also cherry pick f8660233.
Attach a file by drag & drop or click to upload