Merging a few days of progress into the production branch