This works on 9.4 and master but not on 9.2.2 (for which there is a separate fix)
Fixes #21682 (closed)