Merged changes from the main fork at this point
This tag has no release notes.