Merged conflict from upstream