Rebased and merged.