Merge branch 'master_tpda'