Remerged upstream changes