Task 11184 - refactoring and parallelization