Latter half of the second batch for 1.8.0