Merge "Fix context leak." into lmp-dev