Merged in r2821,2824,2827 from hvirt branch.