swig removed.
Merge branch 'development' into staging