Merge "Decorrelate tuning mode and tuning tool" into main