Updated for integration-tests
Updated for v1.2.1
Merge branch 'release/1.2.1'