Merge "Correct the permission of checkin dir"