Integration

Integrate the changes from 'original' repo.