Manually merging some of the changes applied to master.