FileProvider update
FileProvider PR
Claim MediaExtension b2 for myself + a few other fixups
Add diffs.