Merge "Fixed issues found in integration testing" into dublin