Yesterday
merge from misc_alloc_cleanup