integrated OldRender branch.