TLA Support on behalf of e-ddie

Separate pull request as requested
Build with latest SWIG