Additional Changes

These need to be merged into 'development' before you merge 'development' into master.