[Bug 226442] Merge Review: swig