Merge correction
Disable ding_Varnish from make