Merge "Introduce link classes for media mainline module"