Created by: cvrebert
Addresses #13811 (closed), although the tests mentioned in that issue also need to be added. /cc @fat