Synchronized with apache:branch-0.9