nu774 Merge upstream updates to version 2.1