Fixed merge conflicts, and doing a new pull request because I messed up ...

...#6607