Merge changes from production use