Preliminary version
Merge branch 'integration-v2.0' into feature/US_34254
Merge branch 'integration-v2.0' into feature/US_34254
More tests
Merge remote-tracking branch 'origin/integration-v2.0' into feature/US_34254
New tests
Merge pull request #517 from owdqa/feature/US_34254

Feature/us 34254