Rebased merge (translation incl.)