Bug/4393 heap