follow changes from apache repo