Closes #3414148
Pending both commit of [#3413859] and the opening of a 2.x branch where we could merge this. 😅