Comment 19 for bug 1202266

Shall be a common OSSA with 1073306