Merge "Modify the frame context memory deallocation"