Merged codebased deployment

Changes to merged codebase needed for deployment.