Merged some of the upstream changes

Manual merge do to several asynchronicity between repositories.