Merged in some staged changes.