[#82202634] Second Pivotal commit