Merging devin's-other-branch with master

Merging the changes made in devin's-other-branch with the master branch.