Feature Branch Catch-Up to Master

Changes made on the master branch should be made on the feature branch.