Closes #40042 (closed) #40045 (closed)
This is based on !50 (closed), I'll rebase onto any changes for that MR.