Rebasing and reviewer changes