4/22 Pull from apache 0.8 brach