Merge "Fix the loop log issue"