All tests pass (except some already fixed on master ... i hope)
fixed merge problems prior to merge