Merge v0.6.20 into swig support