Additional changes to the merged code to use more recent changes from the master branch.