Issue/11103 Make the Files\Mapper recursively

New PR for jenkins to trick around #11233