Black hole issue solved
Merge branch 'master' into feature1
Remove everything