Merge branch 'refactor/gun-pool-registry' into 'develop'