Merge "Fix the progress getting for mapped files" into sc-dev