Merged for production

Merge dev changes for production deployment.