Merge branch 'pool_rebirth'