changes to file settings before master merge.