Updated file_entity version and media is checked out from git
Merge
Merge