Merge branch 'master' into pool_rebirth