Merged Changes from upstream