Merge branch 'pool-usage' into 'develop'