Moving DOS's changes to master

moving to master to be deployed to Dev Server