fix variables that have been initialised from the return of another method call
Merge branch 'master' into local_config
rename field
update zip to reflect merged master