Merge upstream updates up to cc19a17 (latest at time of this commit)