Test 1 (speed): You need a really big site (for example moodle.org with a lot of folder) Open Filepicker and navigate inside 'Server files'. Should be faster than it was Please note that filepicker Javascript is still slow for rendering files (rendering starts when loading gif stops spinning) Test 2 (regression): Add one/several courses with at least one module of each changed module type: book, data, forum, glossary, imscp, workshop Add data with files of different types (images and non-images) in those modules Enable legacy file area in one of the courses and add files there As admin/teacher create a folder and make sure you can navigate in filepicker Server files through all modules Open insert image filepicker in some textarea and make sure you can navigate and Server files only shows folders with image files