Feature/keep media filename (#15326)