Merging changes for production use