TAMSUI: prepare for merge with main repo!