Merge "Bug 196 SO+UI container memory leak" into v2.0