Merge from ecomp 718fd196 - Integration Tests

No match.