Merge "Tuner updates"