Merge upstream conflicts
Limit multiprocessing processes to 32 tasks before recycling
Merge branch 'dev'