merged patches from u8815