ref #6047: add the adapted files