Merge latest changes that have been deployed live