Issue #2321011 by sylus: Fixed File Entity + Media updates.