pivotal integration [Fixes #74632906]