Merging last minute Dasein upstream changes into TWC