Add the dependencies that will be necessary for #5022
rebased onto da0c1b6eeff8e03217fba367ec8fc0bf64543c4e
Pull-Request has been merged by pingou
Add the dependencies that will be necessary for #5022