Merge 1.2.0 changes

Merge to stable 1.2.0 changes.