Merge "Fix bug where wrong folder contents are loaded"