Merge pull request #9284 from gladiac1337/feature-haproxy-v2.0.0