[Bug 226442] New: Merge Review: swig