Merge branch dane-tpda into dane