Merge branch 'feat/simplify-pool-managment' into 'develop'