Merge master into dev

Recent updates that should have been done on the dev branch were done on the master branch