Those fields are not needed...
Merge branch 'master' into ascraeus