Tweak config
Merge branch 'master' into ptr