Upstream merge

Partial merge (core files only) with original repo. No significant changes.