Merged changes from upstream
Merged conflicts from upstream