Work in progress on NDR correlation

I've also checked in the beta2pre3-2014-07-11