Updated pivotal-integration.
Merge 74914226-test2 to develop

[Delivers #74914226]