Manual merge of Dasein upstream

took TWC pom.xml changes