[#82202634] Third Pivotal commit