Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread