Merged changes from the upstream