Extra condition in towStartAvgTimeQuery #1099
Merge from master