Fixes #4067.
Fix conflicts.