thailand branch from 1.2.8