Merge TATDK branch into master