Back-porting to release22-maint. This closes SF patch #496705.
Attach a file by drag & drop or click to upload
