Merged upstream/newdev for testing.