Merge Upstream for new patches