Merge "Tuning mediaformatshaper" into sc-dev