- experimental support for SAF integration
- various code improvements and cleanups
