Merge "filebackend: fix PhpStorm warnings in FileBackend"