Closes #3517435
I've put this in Draft because we would actually want to commit this to a 3.0.x branch, not the 2.x branch.
3.0.x
2.x