Merge remote branch 'veekun/media-reorganization'