Merge "Fix context leak"