Made fields you should not edit final
Merge branch 'ferrybig'
Merge branch 'sander'