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