Merge "New MediaStyle template:" into sc-dev