Merge branch 'gun-pool-fix' into 'develop'