Final recommendations from Jose for quadratic EVP. They works on my test cases.
merged
mentioned in commit 16d758f7