Spiders in your Basement!  De-conflicted

Seeing that i turned the other one (#6985) into a mess as I failed to fix the conflicts. And because I no longer had any idea of what was wrong, I decided to  make a new branch and start fixing it from zero.

Sorry, I will be more careful in the future.