Tracking fixed stuck loop
Merge origin/master