Backport #1809 to 2.3 (actually creating the method)

This is needed to ease the testing of the backport of #1792
Separate PRs will follow