Develop

Merge the changes from develop into rewriteInputStructs.