merge fixes. some I already did and why cherry pick failed