Added media_merge
Renamed Polyfill in Work-around