FS-6061 --resolve
FS-6061 swigall
chage swig hack diff
update python diff