[MTS-1900] more tuning for just us