[D11] 31218 and 33063 from main branch. A few modifications needed to prevent other updates being dragged in, there are all commented and can be reverted when we update more broadly.