Merge "Revert "Add validation for performance tuning""