Merge pull request #1834 from jerome-benoit/fix-dynamic-pool