Adjustments in pools module
Bug fixes
Fixes bugs
Merge branch 'develop_refactoring' into qa