Merged with master changes.