fix allocation error for resource_allocation
Merge branch 'dev' into dev_mirror