Import of 6.6
Merge branch 'master' into AES-CTR