Merge remote branch 'ohd/gingerbread' into merge