Made combiner creation threadsafe, fixed #3625
Merge pull request #3628 from noctarius/issue_3625_maintenance

Made combiner creation threadsafe, fixed #3625 (maintenance)