Merge branch '4DA-master'
bug: fix file sending
+ refactor rt/st stuff