merge ahcpd from trunk to 8.09