Merge "Fixed missing context while detecting unit strides."