defaulting to naf
Merge branch 'master' into 1.6