Re-rolled patch #18, Attached interdiff for same.
Screenreader is now changed...