merges from haproxy - upstream