Merge "progress_large id defined incorrectly"