Merge "Adjust concurrency configuration." into sc-dev