Merge from trunk to make sure I don't accidentally merge the accidental initialize-list commit and rollback.