971468 - fixing high memory usage during unit unassociate calls