Feature/721 allocations

# Warning
# Info
# Issues
Fixes #1201