Merge "Removing number of threads used in background execution to prevent system thrashing" into sc-dev