Hand-merging changes from repo (1 / 3)
Hand-merging changes from repo (2 / 3)
Merge branch 'gingerbread' into gingerbread-cooperve