Reverse merged from master
Merge pull request #2 from SemanticSugar/merle-pool-fixes2

Merle pool fixes2
Merged from master