Initial import of WBAT 3.8.1