Diagnosing the lag during rescaling
Merge remote-tracking branch 'origin/master'