IMHO, this should be done for the `1.15.0` release. Same thing for #1208