Issue 1+2

If you want both Issue 1 and Issue 2 without merge conflicts, merge this one and decline the other two