merge some from upstream