Merge "Fixing the issue with progress bar." into nyc-dev