Merge "Alpha addresses get put in the same thread" into gingerbread