Fixed merge conflict from upstream