Manually rebased and tested everything afterwards

All changes should be inline with master now…