#2 updating fields and files to apply changes from the master to the dev code.