Second half of the fifth batch for 1.8.0