Yesterday
merge from bradleyapc_allocs